Get conflict results from diff3